From 8ede8a78de6c540146f17ce46bb573ffc2030b11 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 2 Mar 2007 16:57:24 +0000 Subject: [PATCH] Fix -xen build. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c index 53d091d576..8b62b07724 100644 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c @@ -437,7 +437,7 @@ static int tpmfront_suspend(struct xenbus_device *dev) return 0; } -static int tpmfront_resume(struct tpm_private *tp) +static int tpmfront_suspend_finish(struct tpm_private *tp) { tp->is_suspended = 0; /* Allow applications to send again. */ @@ -448,7 +448,7 @@ static int tpmfront_resume(struct tpm_private *tp) static int tpmfront_suspend_cancel(struct xenbus_device *dev) { struct tpm_private *tp = tpm_private_from_dev(&dev->dev); - return tpmfront_resume(tp); + return tpmfront_suspend_finish(tp); } static int tpmfront_resume(struct xenbus_device *dev) @@ -691,7 +691,7 @@ static void tpmif_set_connected_state(struct tpm_private *tp, u8 is_connected) * This also removes the suspend state. */ if (is_connected == 1 && tp->is_suspended == 1) - tpmfront_resume(tp); + tpmfront_suspend_finish(tp); if (is_connected != tp->is_connected) { tp->is_connected = is_connected; -- 2.30.2